From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 4 Aug 2009 03:32:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11233
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5d175a9d3eba3f6123ce120956d667d884bfae26;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d451a9620b6..2d55c0bb457 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (top): Make check for tramp-gvfs loading more
+	robust.
+	(tramp-handle-insert-file-contents): `unwind-protect' must be
+	inside `with-parsed-tramp-file-name'.
+
+	* net/tramp-gvfs.el (top): Remove superfluous message when loading
+	fails.
+
 2009-08-03  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gud.el (jdb): Set gud-jdb-classpath-string to current